Merge from gnulib.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 18 May 2011 00:35:01 +0000 (17:35 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 18 May 2011 00:35:01 +0000 (17:35 -0700)

Trivial merge